switch travis to containers and

restore travis usage of build_and_test.

diff --git a/.travis.yml b/.travis.yml
index 050b03bd452c685c9b8fb4fa4918fad93c327b67..8c5f68fbd91e2df0ec7ba64b18945e32ef4e2e03 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
+sudo: false
 language: cpp
 compiler:
   - gcc
   - clang
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y valgrind expat
+addons:
+  apt:
+    packages:
+    - expat
+    - fop
+    - valgrind
+    - xsltproc
 script:
- - cd gpsbabel ; ./configure && make -j3 all && bash ./testo  && bash ./vtesto
-# TODO: build doc, GUI, mac
+ - ./build_and_test
+# TODO: build mac